Merge branch 'registry-login' into alt-registry-publish-wip

author Chris Swindle <christopher.swindle@metaswitch.com>

Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)

committer Chris Swindle <christopher.swindle@metaswitch.com>

Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)
author Chris Swindle <christopher.swindle@metaswitch.com>
Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)
committer Chris Swindle <christopher.swindle@metaswitch.com>
Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)
diff --cc src/cargo/ops/registry.rs

index 702288f2aef9727d9c34b2660776ef76f7fe4f04,d8364c28d29cfc8a2ff95d072a2508b0626f0bd3..fc2cde8232cdccfb440b2517dc72a76cc51cbc93

mode 100644,100755..100755
--- 1/src/cargo/ops/registry.rs
--- 2/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs
diff --cc tests/publish.rs

index d7eb8ab2e24391deae73c37a9f01eba8579c6d2f,d63087fe292456efb452fcf2ac745f8dbc91b65b..d7eb8ab2e24391deae73c37a9f01eba8579c6d2f

mode 100644,100755..100755
--- 1/tests/publish.rs
--- 2/tests/publish.rs
+++ b/tests/publish.rs
author	Chris Swindle <christopher.swindle@metaswitch.com>
	Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)
committer	Chris Swindle <christopher.swindle@metaswitch.com>
	Tue, 31 Oct 2017 05:26:42 +0000 (05:26 +0000)
		1	2
src/cargo/ops/registry.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/publish.rs	patch \|	diff1 \|	diff2 \|	blob \| history